Added A LOT
fixing git
Merge remote-tracking branch 'origin/master'

Conflicts:
	.DS_Store
	client/.DS_Store
	client/controllers/appClientCtrl.js
	client/extensions/.DS_Store
	client/extensions/images/.DS_Store
	client/extensions/scripts/angular-ui-bootstrap.js
	client/extensions/styles/bootstrapless/variables.less
	client/extensions/styles/jquery-ui.theme.less
	client/extensions/styles/jquery.datatables.less
	client/main.js
	client/styles/main.css.map
	gruntfile.js
	server/.DS_Store
	server/app/controllers/masterPageCtrl.js
	server/app/views/.DS_Store
	server/app/views/404.jade
	server/app/views/500.jade
	server/app/views/includes/mainScripts.jade
	server/app/views/layout.jade
	server/config/express.js
	server/config/routes.js
fixing git