create page
temp
Merge branch 'develop' of https://github.com/florensh/wefactor into feature/FEATURE_10683
added settings.js
edited design
settings.html
added controller advice
security config
added sandstone theme
layout
UserSettingsFormDataObject
setting app jdbc connection pool
added form to settings.html
switching back to spring boot starter 1.0.2
fix heroku for systemtest and customer
added new layout
finished feature
Merge branch 'feature/FEATURE_10683' into develop

Conflicts:
	src/main/resources/application-dev.properties
changed text in editprofile.html
deactivated tests