#12- Move dependencies to bower
Minor fix in bower files
Minor fixes in bower.json and package.json
Adding assets directory to .gitignore file
Merge pull request #20 from juanasas/#12-move-dependencies-to-bower

#12 move dependencies to bower
Highlight the current nav item #21
Merge pull request #22 from juanasas/#21-highlight-the-current-nav-item

Highlight the current nav item #21
#13: Changes of usersFactory.
Merge remote-tracking branch 'origin/master' into #13-create-shared-factory-for-user-data

Conflicts:
	app/js/controllers/usersCtrl.js