Express v4.x
correct path to views
Dependency version care in _bower.json

- adjusts bower.json to allways depend on the latest stable 1.2.x release of angular
- bumps version of bootstrap to match with the version of bootstrap-sass-official
Update Gruntfile.js

mochaTest task needs to be run in 'test' environment. To avoid DB flushing when mochaTest is called by watch, first call 'env:test' task before 'mochaTest'
Merge pull request #157 from antoinepairet/master

Update Gruntfile.js: mochaTest through watch should run in 'test' env
Adding OpenShift hosting with 'yo angular-fullstack:deploy openshift'
Merge branch 'deploy-openshift' of github.com:ryanj/generator-angular-fullstack into ryanj-deploy-openshift
style(deploy): fixed up styling to pass jshint
fixed new production config using wrong port/ip for heroku
Added question to set the name of the deployed app
Deprecated deploy generator in favor of heroku and openshift generators
Allowing deployment to multiple remote openshift hosts
Merge pull request #155 from delight/dep-management

Dependency version care in _bower.json
Fixed issues with Express 4.0 integration
Merge branch 'pr/130'

Conflicts:
	templates/express/config/express.js
Merge branch 'master' of github.com:DaftMonk/generator-angular-fullstack
Merge pull request #172 from ryanj/master

Allowing deployment to multiple remote openshift hosts
Added missing dependency to package.json
Cleaned up accidental line breaks
Updated heroku deployment instructions