#94 Added citation and bibliography entries for Stk-Boot and uOS
Fixed merge conflicts when merging master into iss94