Fix merge conflicts

Author: Math3v

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "angular-ui-notification",
-  "version": "0.3.0",
+  "version": "0.3.5",
   "homepage": "https://github.com/alexcrack/angular-ui-notification",
   "repository": {
     "type": "git",
@@ -31,9 +31,9 @@
     "build"
   ],
   "dependencies": {
-    "angular": "~1.2.23"
+    "angular": "^1.5.x"
   },
   "devDependencies": {
-    "bootstrap": "~3.3.2"
+    "bootstrap": "^3.3.x"
   }
 }

demo/angular-ui-notification.min.css

@@ -1,7 +1,7 @@
 /**
  * angular-ui-notification - Angular.js service providing simple notifications using Bootstrap 3 styles with css transitions for animating
  * @author Alex_Crack
- * @version v0.2.0
+ * @version v0.3.5
  * @link https://github.com/alexcrack/angular-ui-notification
  * @license MIT
  */

demo/angular-ui-notification.min.js

@@ -1,7 +1,7 @@
 /**
  * angular-ui-notification - Angular.js service providing simple notifications using Bootstrap 3 styles with css transitions for animating
  * @author Alex_Crack
- * @version v0.2.0
+ * @version v0.3.5
  * @link https://github.com/alexcrack/angular-ui-notification
  * @license MIT
  */
@@ -46,23 +46,38 @@ angular.module('ui-notification').provider('Notification', function() {
         var notify = function(args, t){
             var deferred = $q.defer();
 
-            if (typeof args !== 'object') {
+            if (typeof args !== 'object' || args === null) {
                 args = {message:args};
             }
 
             args.scope = args.scope ? args.scope : $rootScope;
             args.template = args.templateUrl ? args.templateUrl : options.templateUrl;
             args.delay = !angular.isUndefined(args.delay) ? args.delay : delay;
-            args.type = t || options.type ||  '';
+            args.type = t || args.type || options.type ||  '';
             args.positionY = args.positionY ? args.positionY : options.positionY;
             args.positionX = args.positionX ? args.positionX : options.positionX;
             args.replaceMessage = args.replaceMessage ? args.replaceMessage : options.replaceMessage;
             args.onClose = args.onClose ? args.onClose : options.onClose;
             args.closeOnClick = (args.closeOnClick !== null && args.closeOnClick !== undefined) ? args.closeOnClick : options.closeOnClick;
             args.container = args.container ? args.container : options.container;
             args.priority = args.priority ? args.priority : options.priority;
-
-            $http.get(args.template,{cache: $templateCache}).success(function(template) {
+            
+            var template=$templateCache.get(args.template);
+
+            if(template){
+                processNotificationTemplate(template);
+            }else{
+                // load it via $http only if it isn't default template and template isn't exist in template cache
+                // cache:true means cache it for later access.
+                $http.get(args.template,{cache: true})
+                  .then(processNotificationTemplate)
+                  .catch(function(data){
+                    throw new Error('Template ('+args.template+') could not be loaded. ' + data);
+                  });                
+            }    
+            
+            
+             function processNotificationTemplate(template) {
 
                 var scope = args.scope.$new();
                 scope.message = $sce.trustAsHtml(args.message);
@@ -211,9 +226,7 @@ angular.module('ui-notification').provider('Notification', function() {
 
                 deferred.resolve(scope);
 
-            }).error(function(data){
-                throw new Error('Template ('+args.template+') could not be loaded. ' + data);
-            });
+            }
 
             return deferred.promise;
         };