A
Author Roza
Merge branch 'master' of https://github.com/itc2014/vmallsco

Conflicts:
	db/General_save.php
	general.html
	index.php
	js/script.js
	nbproject/private/private.xml
	notifications.html