model implemented should be tested in future
commit before pull from bbb
Merge branch 'master' of ssh://192.168.7.2/home/ubuntu/Projects/ferryport/

Conflicts:
	nbproject/private/private.xml