Merge pull request #15 from yashodha/CRM-12864

more fixes
CRM-12932 first draft sample data. Needs more activities added to it.
CRM-12843
Merge pull request #16 from davecivicrm/CRM-12932

CRM-12932 first draft sample data. Needs more activities added to it.
Merge branch 'master' of git://github.com/civicrm/civivolunteer into CRM-12864
fixed sample data install