Started working on new cogwheel
Merge branch 'duggasys-CourseMenu' of https://github.com/HGustavs/LenaSYS_2014 into duggasys-CourseMenu

Conflicts:
	Shared/SQL/init_db.sql