.
Merge branch 'master' into gui
add R.java to gitignore
use task for threading
mergefix
Add MakeARecipePages1_2
swap conditions
gitignore classpath
kill R.java
fix login success
Merge branch 'master' into gui
fix json parsing
comm2