20140531/00
Merge branch 'master' of https://github.com/blueset/StereoGIF

Conflicts:
	AndroidManifest.xml
	gen/com/bluesetStudio/stereogif/R.java
	res/layout/activity_camera.xml
	res/layout/dialog_photo_confirm.xml
	res/values/strings.xml
	src/com/bluesetStudio/stereogif/CameraActivity.java
	src/com/bluesetStudio/stereogif/MainActivity.java

merge 00
20140531/001
Merge branch 'master' of https://github.com/blueset/StereoGIF

Conflicts:
	AndroidManifest.xml
	gen/com/bluesetStudio/stereogif/R.java
	res/layout/activity_camera.xml
	res/layout/dialog_photo_confirm.xml
	res/values/strings.xml
	src/com/bluesetStudio/stereogif/CameraActivity.java
	src/com/bluesetStudio/stereogif/MainActivity.java

wtf1