Refactoring: Resolving problems with structure of project.
Add close button on dialogs
Prevent duplicate entries in questions list
Merge remote-tracking branch 'origin/master' into dev

* origin/master:
  Prevent duplicate entries in questions list
  Add close button on dialogs
  Refactoring: Resolving problems with structure of project.

Conflicts:
	AndroidManifest.xml
	src/main/java/org/smilec/smile/bu/QuestionsManager.java