t
d
Merge branch 'master' of https://github.com/Webruin/Webruin

Conflicts:
	app/assets/img/PHP.png
	app/assets/img/php.png