[fix] now tests are run by grunt task
Merge branch 'master' into twitter_bootstrap_3_0_0