Merge branch 'hotfix/1.2.1' into develop
Merge branch 'hotfix/1.2.2' into develop
Upgrade to bootstrap 3.0.2
Merge remote-tracking branch 'Crisu83/bs3'