Merge remote-tracking branch 'origin/master'

Conflicts:
	MyStories/bin/classes/android/support/v7/appcompat/R$color.class
	MyStories/bin/classes/com/mjumel/mystories/R$color.class
	MyStories/bin/classes/com/mjumel/mystories/R$dimen.class
	MyStories/bin/classes/com/mjumel/mystories/R$drawable.class
	MyStories/bin/classes/com/mjumel/mystories/R$id.class
	MyStories/bin/classes/com/mjumel/mystories/R$integer.class
	MyStories/bin/classes/com/mjumel/mystories/R$layout.class
	MyStories/bin/classes/com/mjumel/mystories/R$menu.class
	MyStories/bin/classes/com/mjumel/mystories/R$string.class
	MyStories/bin/classes/com/mjumel/mystories/R$style.class
	MyStories/bin/classes/com/mjumel/mystories/R$styleable.class
	MyStories/res/layout/fragment_my_stories_item.xml
	MyStories/res/values/color.xml
	MyStories/src/com/mjumel/mystories/StoryEventFragment.java
	MyStories/src/com/mjumel/mystories/tools/Communication.java
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/Miyas/MyStories.git