Login fixed
Merge remote-tracking branch 'origin/master'

Conflicts:
	Ideating/src/main/java/pagebuilder/servlets/MainpageServlet.java
	Ideating/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF