fix for logout
Merge branch 'master' of https://github.com/Soulyyy/TheWorldNews
edit
Merge branch 'master' of https://github.com/Soulyyy/TheWorldNews
ts
Merge branch 'master' of https://github.com/Soulyyy/TheWorldNews
Merge branch 'master' of https://github.com/Soulyyy/TheWorldNews
MinMerge branch 'master' of https://github.com/Soulyyy/TheWorldNews

Conflicts:
	src/main/webapp/worldnewsmanifest.appcache
Merge branch 'master' of https://github.com/Soulyyy/TheWorldNews

Conflicts:
	src/main/java/TheWorldNews/tags/ArticleTag.java
Merge branch 'master' of https://github.com/Soulyyy/TheWorldNews

Conflicts:
	src/main/java/TheWorldNews/tags/ArticleTag.java