Merge branch 'upstream_master'

Conflicts:
	CHANGELOG.md
	app/index.js
	package.json
	templates/common/Gruntfile.js
	templates/common/root/app/views/partials/main.html

Author: DaftMonk

Diff for: .travis.yml

@@ -2,3 +2,7 @@ language: node_js
 node_js:
   - '0.10'
   - '0.8'
+before_install:
+  - currentfolder=${PWD##*/}
+  - if [ "$currentfolder" != 'generator-angular-fullstack' ]; then cd .. && eval "mv $currentfolder generator-angular-fullstack" && cd generator-angular-fullstack; fi
+

Diff for: app/index.js

@@ -231,7 +231,7 @@ Generator.prototype.bootstrapFiles = function bootstrapFiles() {
     sourceFileList: files.map(function (file) {
       return 'styles/' + file.replace('.scss', '.css');
     }),
-    searchPath: '.tmp'
+    searchPath: ['.tmp', 'app']
   });
 };
 
@@ -307,11 +307,17 @@ Generator.prototype.createIndexHtml = function createIndexHtml() {
 };
 
 Generator.prototype.packageFiles = function () {
+  this.coffee = this.env.options.coffee;
   this.template('../../templates/common/_bower.json', 'bower.json');
   this.template('../../templates/common/_package.json', 'package.json');
   this.template('../../templates/common/Gruntfile.js', 'Gruntfile.js');
 };
 
+Generator.prototype.imageFiles = function () {
+  this.sourceRoot(path.join(__dirname, 'templates'));
+  this.directory('images', 'app/images', true);
+}
+
 Generator.prototype.serverFiles = function () {
   this.template('../../templates/express/server.js', 'server.js');
   this.template('../../templates/express/api.js', 'lib/controllers/api.js');