api new format ready - Fixed #34 Fixed #17
refactoring API and adding test - Fixed #34
api refactoring and tests ready - Fixed #17
Merge branch 'hot_fix_hashtagTotal' into develop
Merge branch 'develop' into user-index

Conflicts:
	locals/es.json
	views/user/index.jade
adaptando a nueva version de la api