xml
Merge branch 'master' of https://github.com/gosuvn/IdealPad

Conflicts:
	IdealPad.xcodeproj/project.pbxproj