2.6 work in progress; merged trunk and 2.5
2.6 work in progress
2.5w work in progress
fixed bug in blogicbooking (null pointer)
Winkler updates
merge trunk into 2.6