menu panel
merge
merge?
Merge branch 'master' of https://github.com/yovetichg/SummaSteelCityCodeFest2014

Conflicts:
	jobs-calendar/src/main/webapp/index.html