Closes Issues #23,#22,#17,#16,#21
Merge branch 'master' of https://github.com/scottdurow/SparkleXrm.git