Merge branch 'feature/albums-94' into develop

Conflicts:
	app/views/web/photo_albums/show.html.haml
fixes published/hidden news
fixes pages bug 100
Merge branch 'feature/news_publish-90' into staging