Chapter 19\CriminalIntent
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/gradle.xml
	.idea/misc.xml
	.idea/vcs.xml
	app/app.iml
	app/src/main/java/com/star/criminalintent/CrimeCameraFragment.java
	app/src/main/java/com/star/criminalintent/CrimeFragment.java
	app/src/main/java/com/star/criminalintent/PictureUtils.java
Merge remote-tracking branch 'origin/master'
Chapter 19\CriminalIntent add solutions update