Adds planning poker activity
Merge branch 'planning_poker' into development

Conflicts:
	app/AndroidManifest.xml
	app/res/layout/planning_poker.xml
	app/src/se/chalmers/agile5/PlanningPoker.java
Adds planner-activity to manifest
Correcting android-version in manifest

Signed-off-by: Johannes Westlund <iceman@westlundarna.se>