New upload
Merge branch 'master' of https://github.com/Anparejo/DAM into development

Conflicts:
	MathGame/res/layout/game_layout.xml
	MathGame/src/com/project/mathgame/daos/QuestionDAO.java
	MathGame/src/com/project/mathgame/model/Database.java
	MathGame/src/com/project/mathgame/view/AddStoryActivity.java
	MathGame/src/com/project/mathgame/view/GameActivity.java
	MathGame/src/com/project/mathgame/view/OptionsActivity.java