version 1.0
Merge branch 'master' of https://github.com/netmail-open/wjelement

Conflicts:
	src/wjreader/CMakeLists.txt
	src/wjwriter/CMakeLists.txt