Updated builds
Merge branch 'master' of https://github.com/politankz/tbiresearchforum-new

Conflicts:
	TBIResearchForum-android/.idea/workspace.xml
Updated gitignore