Merge branch 'master' of github.com:dariushha/iMVC

Conflicts:
	db/php-activerecord/initializer.php
	db/php-activerecord/vendor/.gitignore