I dont know what i changeded
Merge remote-tracking branch 'origin/master'

Conflicts:
	MyApplication/.idea/misc.xml
	MyApplication/app/app.iml