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

Conflicts:
	drupal.sql