updating
Merge branch 'origin' of https://github.com/jenkinsforsam/SamProjects2014.git into origin