upd
First commit
Merge remote-tracking branch 'origin/login' into login

Conflicts:
	Ideating/src/main/webapp/js/frontpage.js
Merge remote-tracking branch 'origin/master'