String to StringBuffer conversion started
Merge branch 'master' of https://github.com/arkan85/picOps.git

Conflicts:
	gen/com/snippetdump/picops/R.java
	res/layout/activity_start.xml
	src/com/snippetdump/picops/EditingActivity.java
	src/com/snippetdump/picops/FilterEffectsTabActivity.java
	src/com/snippetdump/picops/FilterTabActivity.java
	src/com/snippetdump/picops/StartActivity.java
	src/com/snippetdump/picops/controller/CleaningController.java
	src/com/snippetdump/picops/controller/ExportController.java
	src/com/snippetdump/picops/controller/FileController.java
	src/com/snippetdump/picops/controller/FilterController.java
	src/com/snippetdump/picops/controller/StepController.java