stuff and things
Merge branch 'development' of https://github.com/SMUDFS/springb2014 into development