update
Merge branch 'master' of https://github.com/mrrej89/UICon.git

Conflicts:
	Mobile/js/main.js