#26. Removed requirejs.
Merge branch 'origin/concat'

Conflicts:
	Gruntfile.js
	package.json
	public/js/app.js
	public/js/controllers/CompanyCtrl.js
	public/js/controllers/HomeCtrl.js
	public/js/controllers/LoginCtrl.js
	public/js/controllers/OrdersCtrl.js
	public/js/controllers/UserCtrl.js
	public/js/directives/dateInput.js
	public/js/directives/ngMenu.js
	public/js/directives/notification.js
	public/js/main.js
	public/js/services/CompanyFactory.js
	public/js/services/NotificationFactory.js
	public/js/services/UserFactory.js
	public/js/services/routeResolver.js
	public/webapp.html
Merge branch 'origin/concat'

Conflicts:
	Gruntfile.js
	package.json
	public/js/app.js
	public/js/controllers/CompanyCtrl.js
	public/js/controllers/HomeCtrl.js
	public/js/controllers/LoginCtrl.js
	public/js/controllers/OrdersCtrl.js
	public/js/controllers/UserCtrl.js
	public/js/directives/dateInput.js
	public/js/directives/ngMenu.js
	public/js/directives/notification.js
	public/js/main.js
	public/js/services/CompanyFactory.js
	public/js/services/NotificationFactory.js
	public/js/services/UserFactory.js
	public/js/services/routeResolver.js
	public/webapp.html