better menu list in content
Merge remote-tracking branch 'origin/0.0.7' into 0.0.7

Conflicts:
	app/views/mokio/contacts/_form.html.slim
	app/views/mokio/mov_galleries/_form_inputs.html.slim
	app/views/mokio/pic_galleries/_form_inputs.html.slim