Some fix
Merge branch 'master' of https://github.com/justplay1/hackathon

Conflicts:
	Hackathon/bin/AndroidManifest.xml
	Hackathon/bin/R.txt
	Hackathon/gen/com/hackathon/R.java
	Hackathon/src/com/hackathon/net/HttpRequests.java
	Hackathon/src/com/hackathon/suggestproblem/SuggestProblemActivity.java
Merge branch 'master' of https://github.com/justplay1/hackathon