Changed node version to 0.10
Added missing
 files
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/js/lib/angular-ui-states.min.js
	assets/js/lib/bootstrap.min.js
	views/partials/account/index.jade
	views/partials/account/view.jade
Added missing
 files