smth is going wrong ?
Add .DS_Store to gitignore
Merge branch 'develop'

Conflicts:
	.gitignore
Add *.orig files to gitignore
Merge branch 'master' of https://github.com/BitMobile/core

Conflicts:
	Mobile/Base/BusinessProcess/Application/Settings.cs
Merge branch 'master' into develop