Commit: Merge Commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/co/nextix/jardine/activites/fragments/ActivityInfoFragment.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'