Merge pull request #825 from tonyrd/Release-06062014

Release 06062014
Merge pull request #834 from RichmondDay/development

Release-06172014
Merge pull request #840 from RichmondDay/development

Development
Merge pull request #841 from RichmondDay/master

hot fix merge