Latest changes
Merge branch 'master' of https://github.com/hcilabasu/teachable-mobile

Conflicts:
	databases/storage.sqlite
	static/js/problems.js