1
Merge branch 'master' of github.com:slavmak93/test_system

Conflicts:
	usr/local/apache/conf/vhosts.conf
	usr/local/apache/logs/access.log
	usr/local/apache/logs/error.log
	usr/local/mysql-5.5/data/ib_logfile0
	usr/local/mysql-5.5/data/ibdata1
	usr/local/mysql-5.5/data/phpmyadmin/pma_recent.MYD
	usr/local/mysql-5.5/data/phpmyadmin/pma_recent.MYI