fix admin assets
Merge branch 'master' of github.com:fvillegas/franciscovillegas.net

Conflicts:
	public/admin/assets/templates/posts/show.tpl.html