camera on 4.0.3 still not work,fixed showing photo when add
Merge remote-tracking branch 'origin/master'

Conflicts:
	Source/app/src/main/java/com/example/lord/quest/QuestionAddActivity.java
minor bug fixes
minor bug fixes