Merge branch 'master' into gulp

Author: mraible

.bowerrc

@@ -0,0 +1,3 @@
+{
+  "directory": "app/bower_components"
+}

.gitignore

@@ -2,6 +2,7 @@ logs/*
 !.gitkeep
 dist/
 node_modules/
+bower_components/
 tmp
 .tmp/
 .DS_Store

.jshintrc

@@ -0,0 +1,24 @@
+{
+  "strict": "global",
+  "globals": {
+    // Angular
+    "angular": false,
+
+    // Angular mocks
+    "module": false,
+    "inject": false,
+
+    // Jasmine
+    "jasmine": false,
+    "describe": false,
+    "beforeEach": false,
+    "afterEach": false,
+    "it": false,
+    "expect": false,
+
+    // Protractor
+    "browser": false,
+    "element": false,
+    "by": false
+  }
+}

.travis.yml

@@ -1,16 +1,21 @@
+sudo: required
+dist: trusty
+
 language: node_js
 node_js:
-  - 0.8
+  - '4.5'
 
-before_script:
+install:
   - export DISPLAY=:99.0
   - sh -e /etc/init.d/xvfb start
-  - npm install --quiet -g karma
-  - npm install --quiet -g protractor
-  - ./scripts/web-server.js > /dev/null &
-  - sleep 1 # give server time to start
+  - wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | sudo apt-key add -
+  - sudo sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google-chrome.list'
+  - sudo apt-get update -q
+  - sudo apt-get install -q google-chrome-stable
+
+before_script:
+  - npm install
 
 script:
-  - karma start config/karma.conf.js --no-auto-watch --single-run --reporters=dots --browsers=Firefox
-  - webdriver-manager update
-  - protractor config/protractor-conf.js --browser=firefox
+  - npm run test-single-run
+  - (npm start > /dev/null &) && (npm run protractor)

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright (c) 2010-2012 Google, Inc. http://angularjs.org
+Copyright (c) 2010-2016 Google, Inc. http://angularjs.org
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal