Next round of updates from code review
Merge branch 'v0.3.0RC' of https://github.com/pencilblue/pencilblue into v0.3.0RC