Added proposal values
added spring security login and roles
Merge branch 'master' of https://github.com/deviant32/Filbin.git

Conflicts:
	Filbin/web-app/DynamicForm/WebContent/javascript/src/elements.js
changed git ignore