resolve conflicts
Merge branch 'develop' of https://github.com/relentlesscoder/WSE into develop