updating poms for 0.1.2-SNAPSHOT development
updating develop poms to master versions to avoid merge conflicts
Merge branch 'master' into develop
Updating develop poms back to pre merge state
updated sublicensed panel, button sizes, added icons
adjusted grid for each viewpoint
created sticky footer
fixing third email not displaying on review modal
fixed footer/container hiding
Merge branch 'develop' of https://github.com/IHTSDO/MLDS into develop
fixing broken bootstrap dropdowns
Merge branch 'develop' of https://github.com/IHTSDO/MLDS into develop

Conflicts:
	src/main/webapp/views/user/usageLog.html
fixed footer
Merge branch 'develop' of https://github.com/IHTSDO/MLDS into develop
adjusted dashboard layout
MLDS-22 Track current type in the embedded usage report during registration
Merge branch 'develop' of ssh://github.com/IHTSDO/MLDS into develop
MLDS-24 Fix + sign on add hospital dialog
Merge branch 'develop' of https://github.com/IHTSDO/MLDS into develop
MLDS-22 Force application save on application type change to track usage report