Added parse
Merge branch 'master' of https://github.com/SaveThatDish/STD.git

Conflicts:
	SaveThatDish/src/com/example/savethatdish/MainActivity.java
Fixed errors with parse 1.5.0