* fix
Merge branch 'master' of https://github.com/rreimi/jynx
added stats partial
Merge branch 'master' of https://github.com/rreimi/jynx

Conflicts:
	app/models/Publication.php
Merge branch 'master' of https://github.com/rreimi/jynx
Merge branch 'master' of https://github.com/rreimi/jynx

Conflicts:
	public/css/base.css
stats added
Merge branch 'master' of https://github.com/rreimi/jynx

Conflicts:
	app/lang/es/content.php