qq
11
Merge branch 'master' of https://github.com/lunzii/iMaker

Conflicts:
	Manager/.idea/workspace.xml