Fixes, SettingsModel beginnings.
Merge branch 'master' of github.com:lynntesia/Data-Tamers

Conflicts:
	AppliedAnalytics/src/main/java/io/analytics/domain/GoogleUserData.java
	AppliedAnalytics/src/main/java/io/analytics/repository/IManagementRepository.java
	AppliedAnalytics/src/main/java/io/analytics/repository/ManagementRepository.java
	AppliedAnalytics/src/main/java/io/analytics/service/IManagementService.java
	AppliedAnalytics/src/main/java/io/analytics/service/ManagementService.java
	AppliedAnalytics/src/main/java/io/analytics/servlets/AuthorizationCallbackServlet.java