more cleanup
started move to bootstrap3
Merge branch 'develop' into staging