last commit before switch to skeleton css library
Merge branch 'bootstrap' into develop