no message
Merge branch 'master' of https://github.com/RiQQ92/Maverick

Conflicts:
	Minioppi/bin-debug/Minioppi.swf
no message
Merge branch 'master' of https://github.com/RiQQ92/Maverick