login
Merge branch 'master' of https://github.com/LuckyBanana/HuntingSNClient

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/HuntingSNClient.apk
	bin/classes.dex
	bin/classes/com/example/huntingsnclient/R$id.class
	bin/classes/com/example/huntingsnclient/R$layout.class
	bin/classes/com/example/huntingsnclient/R$menu.class
	bin/classes/com/example/huntingsnclient/R$string.class
	bin/classes/com/example/huntingsnclient/R$style.class
	bin/classes/com/example/huntingsnclient/R$styleable.class
	bin/classes/com/huntingsn/client/TimelineActivity$DummySectionFragment.class
	bin/classes/httpclient/GetTask.class
	bin/classes/httpclient/RESTHTTPClient$ParamsStringBuilder.class
	bin/classes/httpclient/RESTHTTPClient.class
	bin/classes/tasks/GetProfileTask.class
	bin/classes/tasks/GetTimelineTask.class
	bin/classes/utils/ListHashMapConstructor.class
	bin/resources.ap_

login