update bootstap 3.1 -> 3.2
update bootstap 3.1 -> 3.2
Merge branch 'develop' into feature/users_permissions