fix bad pull 1
Merge branch 'master' of github.com:inverts/Data-Tamers
Merge branch 'good'
Added back my changes for local repo
added empty line so no whitespace diff
added empty line so no whitespace diff
adding changed files
Drag Line
Merge branch 'master' of github.com:inverts/Data-Tamers
adding changes to forecast widget
merged new js for hypothetical-future
Fixed broken profile image, fixed Google Auth test, added Permission
domain object.
Merge branch 'master' of github.com:inverts/Data-Tamers
Removing the revenue sources bean caused internal errors, instead
commented out the javascript code that displays the widget.
Fixed issues with dragging and widgets
Merge remote-tracking branch 'origin/master' into DEV

Conflicts:
	AppliedAnalytics/src/main/webapp/WEB-INF/views/pages/application/dashboard.jsp