adding submenu system calls to client.config template
Replaced tab indents with space indents(tab size 4)
Remove superfluous EOL space from _bower.json
Remove superfluous EOL spaces _package.json
Remove superfluous EOL spaces in gruntfile.js
Remove superfluous EOL spaces from templates/app/*
Remove superfluous EOL spaces in app/templates/config/*
Remove superfluous EOL spaces in angular-*/*
Merge branch 'pr/22' into 0.1.4
Merge branch 'pr/20' into 0.1.4
EOL
Merge branch 'pr/21' into 0.1.4

Conflicts:
	angular-config/templates/_.client.config.js
	angular-controller/index.js
	angular-controller/templates/_.client.controller.js
	angular-controller/templates/_.client.controller.test.js
	angular-directive/index.js
	angular-directive/templates/_.client.directive.js
	angular-filter/index.js
	angular-filter/templates/_.client.filter.js
	angular-route/index.js
	angular-route/templates/_.client.controller.js
	angular-route/templates/_.client.controller.test.js
	angular-service/index.js
	angular-service/templates/_.client.service.js
	angular-test/index.js
	angular-test/templates/_.client.controller.js
	angular-test/templates/_.client.controller.test.js
	angular-view/index.js
	app/templates/app/controllers/users.server.controller.js
	app/templates/app/routes/articles.server.routes.js
	app/templates/config/express.js
	app/templates/config/strategies/local.js
Fixed Conflict
Updating to 0.3.1
Fixing indentation Errors
Updating Crud to ng-bind
Merge branch '0.1.3'
Update Version
Fixing routes indent