switched to latest bootstrap (3), adapted layout
Merge branch 'develop'