Updates

Made some changes to simplify the script
Merge branch 'master' of https://github.com/Carmolio/projects

Conflicts:
	MS/index.php