Merge branch 'master' into work
bundle updated
update jquery and bootstrap, and use cdn for them.
ignore log/
update bootstrap
update to bootstrap3
Merge branch 'work'