Cleaned up Authorization organization.
Merge branch 'master' of git@github.com:lynntesia/Data-Tamers.git

Conflicts:
	AppliedAnalytics/src/main/java/io/analytics/site/controllers/ApplicationController.java
	AppliedAnalytics/src/main/java/io/analytics/site/controllers/WidgetController.java
	AppliedAnalytics/src/main/webapp/WEB-INF/views/includes/settings.jsp