On branch master - first check in the bambooreader
On branch master - temporary checkin
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/bcontext.cpp