Merge branch 'master' of https://github.com/SharedFriend/trs
Merge branch 'master' of https://github.com/SharedFriend/trs
insert DbActivity
Merge branch 'master' of https://github.com/SharedFriend/trs

Conflicts:
	AndroidManifest.xml