phult
phult
phult
phult
Merge remote-tracking branch 'origin/master'

Conflicts:
	Dev/web/app/views/blog/categories/cate-guru.php
	Dev/web/vendor/composer/autoload_classmap.php
	_Doc/Dev/uml.eap