add flavours
no change
no change
gitignore
Merge branch 'master' of github.com:hyrtyp/ceistudy

Conflicts:
	.gitignore
	CeiCustomPhone/CeiCustomPhone.iml
	ceistudy.iml