small changes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	Seranet.SpecM2.Web/Content/default-theme/css/main.css
	Seranet.SpecM2.Web/app/admin/admin.html
	Seranet.SpecM2.Web/app/dashboard/dashboard.js
Merge remote-tracking branch 'upstream/master'
User with both Admin and Auditor roles can function properly
miscellaneous
Custom Authorize Attribute file
Merge pull request #66 from madhushib/master

Same person can be admin and auditor and custom authorization attributes added