Create bobroom complete
Merge remote-tracking branch 'origin/master'

Conflicts:
	BoBtudy/app/src/main/java/doublej/bobtudy/UI/LoginActivity.java