Doing some touch up
...
Merge remote-tracking branch 'origin/master'

Conflicts:
	SP1Framework/menu.cpp
Menu is finnaly done!!!