Palapelin palat.
Merge branch 'master' of https://github.com/RiQQ92/Maverick

Conflicts:
	Minioppi/.actionScriptProperties