readd flexbox html file, fix indent in content.php template
fix indents in flexbox.html (spaces or tabs? I use two spaces)
Merge branch 'dev' of github.com:Mathias-Gartner/Battle-of-Conquest into dev