alerts now are different from each social network, tests fixed and API ready - Fixes #47
Merge branch 'modelAlert' into develop
refactor para incluir left-menu en master layout.jade
css to less
removing test.less
minor bug
user index dashboard
api new format ready - Fixed #34 Fixed #17
index layout
faltan graficos con datos reales
mas interfaz
refactoring API and adding test - Fixed #34
api refactoring and tests ready - Fixed #17
Merge branch 'hot_fix_hashtagTotal' into develop
alignment
Merge branch 'develop' into user-index

Conflicts:
	locals/es.json
	views/user/index.jade
adaptando a nueva version de la api
cambio de stats counByDay de totalTweets a totalPosts
diseño y hide de otras redes
empezando vista por campaña
diseño