Merge branch 'master'
Merge branch 'origin/master'
first welcome page prototype
more welcome page updates
many small changes
add page model buider
starting soon feature
'edit' page
Update login.ftl
Update login.ftl

add page login
spring security first try
fix web.xml (facepalm)
Update login.ftl

CHANGE FOR SPRING SECURITY
Update login.ftl

add checkbox
Update login.ftl

add checkbox
starting soon feature
Merge remote-tracking branch 'origin/Develop' into Develop
fonts update
new folders for 'user'
'user' layout