changes where in userserver and adds phantom render for controller
fix merge conflict
Merge pull request #101 from bloodhawk/master

changes where clause in userserver and adds phantom render for pdf downloads
Merge branch 'master' of https://github.com/lds-reporting/site-reporting