Commit: Minor Changes in Data for Activity Fragments
Merge remote-tracking branch 'origin/master'

Conflicts:
	res/layout/view_activity_trainings.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Commit: Merge Commit
Merge remote-tracking branch 'origin/master'
Commit: Date and Time changes
Merge remote-tracking branch 'origin/master'