Fixed crypto include problem.
Merge branch 'BL_Branch_5-30-14' of https://github.com/lansdon/cpts483_drc into BL_Branch_5-30-14