merge
Merge branch 'master' of https://github.com/Miyas/MyStories.git

Conflicts:
	MyStories/bin/classes/com/mjumel/mystories/LoginActivity$UserLoginTask.class