Count default language of users
Merge branch 'master' of https://github.com/cabadsanchez/newshack-team11

Conflicts:
	newshack/src/main/java/es/daedalus/newshack/TwitterManager.java
Merge branch 'master' of https://github.com/cabadsanchez/newshack-team11