Merge branch 'master' of https://github.com/vasyaivanov/mobremcon

Conflicts:
	AWS_Website/APP.JS