change with unknown purpose (propara integration to visual papara?)
Merge branch 'master' of github.com:sim82/papara_nt

Conflicts:
	CMakeLists.txt