Merge pull request #23 from surevine/master

Don't exception on dataform headline message
Merge branch 'master' of github.com:lloydwatkin/buddycloud-server-java