Many fixes to make code work
Merge branch 'master' of http://github.com/anidev/612-2014-advanced

Conflicts:
	Arm.cpp