temp file after build of application
add new migrate file to add new column into companies table
added functionality of selection of company from header bar for every category like FRN, CIPA etc
Merge branch 'dev-master'

Conflicts:
	public/scripts/app.js
	public/scripts/controllers/Company.js
	public/scripts/controllers/Dashboard.js
	public/scripts/shared/Services.js