fix
Merge branch 'develop'
fix
add
add new hr style
Merge branch 'develop'
new
Merge branch 'master' into python3

Conflicts:
	miniakio/static/style/style.css
	miniakio/static/style/style.min.css