Merge https://github.com/paletas/YambaPDM_2013

Conflicts:
	src/pt/isel/pdm/yamba/twitter/services/TimelinePullService.java
Merge https://github.com/paletas/YambaPDM_2013