Master - 1
Merge branch 'master' into lms_player_admin

Conflicts:
	README.md