add BitMobile server
Merge branch 'master' of https://github.com/BitMobile/core

Conflicts:
	.DS_Store
	SyncService/.DS_Store
	SyncService/SyncService/.DS_Store
Merge branch 'master' into develop