Merge branch 'FIX-MOBILE-468' into master_with_468
Merge branch 'MOBILE-441' of https://github.com/moodlehq/moodlemobile into master_with_468
Changed login front page
Password remembering done via tokens, which can be forgotten on logout
Merge branch 'FIX-MOBILE-434' into release_candidate
MOBILE-446 WIP
Merge branch 'MOBILE-446' into release_candidate

Conflicts:
	config.json
Dialog box shows as coded by Ian Edwards @ Kineo
Merge branch 'courses' into release_candidate

Conflicts:
	lib/mm.db.js
	plugins/findcourses/main.js
Merge branch 'release_candidate' of https://github.com/moodlehq/moodlemobile into release_candidate
Forgot to include template in require statement
Merge branch 'courses' into release_candidate
MOBILE-466 Add e-learning/SCORM plugin
Merge branch 'MOBILE-446' into release_candidate
Merge branch 'release_candidate' of github.com:moodlehq/moodlemobile into release_candidate
Merge remote-tracking branch 'upstream/release_candidate' into feature_theme-from-release-candidate

Conflicts:
	lib/mm.db.js
	plugins/findcourses/main.js