Dev build work
Merge branch 'demo2014' of http://github.com/wpears/BathCat into demo2014