Bug fixes and planning poker update
Merge