Refactored app.js
Merge branch 'master' of https://github.com/rougeth/SAMP

Conflicts:
	src/static/app/app.js