synch
Merge branch 'master' of https://github.com/anvar-sagutdinov/smartexe

Conflicts:
	www/sites/all/themes/smartexe1/template.php