Added some json parsing
Merge branch 'master' of github.com:w0nche0l/parrotandroid
Some styling
More styling
Merge branch 'master' of github.com:w0nche0l/parrotandroid

Conflicts:
	gen/com/ddd/ClipSync/R.java
	src/com/ddd/ClipSync/MainActivity.java