Submission commit
FF1
Merge branch 'deep_links' into dev

Conflicts:
	app/js/controllers/userCodingCtrl.js
Merge pull request #1107 from ananthhh/dev

Merged deep_links to dev