Init
Merge remote-tracking branch 'origin/master'

Conflicts:
	find-b-way/src/main/webapp/hello.js