New version based on Bootstrap v3.2
Merge branch 'develop'