Local
Merge branch 'master' of https://github.com/danibram/danux

Conflicts:
	public/.htaccess