Popup help
Merge branch 'master' of https://github.com/aitoroses/danux into Pruebas

Conflicts:
	public/semiems/css/stylep.css
Merge
Compilation Css Merge