What a mess.
Merge branch 'feature/rollback_to_bootstrap-image-gallery' into develop
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'develop' of github.com:drakeguan/siggraphwall into develop