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

Conflicts:
	IdealPad.xcodeproj/project.pbxproj
Merge branch 'master' of https://github.com/gosuvn/IdealPad

This reverts commit afa60d40c833f81c6813ac09e2c81c15c81e3d3a.

Conflicts:
	IdealPad.xcodeproj/project.pbxproj