Merge branch 'dev'
Merge branch 'master' into dev
Update Bootstrap to 3.0.3