Closes #43
Merge branch 'enhancement-#43' into develop
New wesCountry and graphs bugs fixed
Merge branch 'develop'

Conflicts:
	app/__init__.py