Cleaned up solution and EAP
Merge branch 'master' of https://github.com/famstutz/SoCrm