added test.py
added test for registration
added more test functions
added sample-config.py
Merge branch 'dev'
resolved conflicts