Upgrade to Vanilla 2.1.3
Upgrade Bootstrap theme to v2.3.2
Merge branch 'develop'