blueprint -> base
add upgrade instructions
fix merge conflicts
fix merge conflicts
no idea why those merge conflicts are still conflicts
base template -> blueprint
Merge pull request #154 from hbillings/0.9-beta6

fix language