yhyh
Merge branch 'master' of https://github.com/poloure/drunken-archer

Conflicts:
	src/yay/poloure/simplerss/main_view.java
No idea.
Merge branch 'master' of https://github.com/poloure/drunken-archer
Added attribute to fragment_main_dummy and started work on the manage fragment view.
Merge branch 'master' of https://github.com/poloure/drunken-archer

Conflicts:
	src/yay/poloure/simplerss/main_view.java
Merge pull request #23 from Currfyg/master

Merge