Merge pull request #73 from juancjara/development

Development
Merge pull request #74 from juancjara/development

edit bugs fixed and toggle view
Merge pull request #75 from juancjara/development

view icones, delete fixed'
Merge pull request #76 from juancjara/development

weight parseint
Merge pull request #77 from juancjara/development

login css
Merge pull request #78 from juancjara/development

login floro added
Merge pull request #79 from juancjara/development

grunt update
slider and bracket
Merge remote-tracking branch 'upstream/master'
Merge pull request #80 from andreqi/master

css simple view
Merge pull request #81 from juancjara/master

update dev