Upgraded bootstrap to 3.0.3
Merge branch 'dev' into beta
Merge branch 'beta'