update bootstrap 3.0-wip
add gitignore
add common js file
cleanup untracked/ignorable files
fix options
Merge branch 'develop'
Merge branch 'master' into gh-pages