Serie1 fix
Serie1 fix
Serie1 fix
Serie1 fix
Serie1 fix
TweetParser, HashTags

further TweetParser development
Update gitignore
Merge branch 'master' of https://github.com/mangas/AED2014

Conflicts:
	.gitignore
	.idea/.name
	.idea/compiler.xml
	.idea/copyright/profiles_settings.xml
	.idea/encodings.xml
	.idea/misc.xml
	.idea/modules.xml
	.idea/scopes/scope_settings.xml
	.idea/uiDesigner.xml
	.idea/vcs.xml
	main/java/tweets/data/HashTagFilter.java
	test/java/tweets/data/TweetParserTest.java
	test/test.iml