Merge branch 'testing' into develop(merge -s ours to mark the version number change as merged)
Update cherrypy, fix unicode bugs
Merge from develop
four line chang to imprt nccesary files in unit tests
four line chang to imprt nccesary files in unit tests
Update Version Number for release 0.3.2
Merge branch 'master' into testing