More generic configuration
Implement issue#1 (https://github.com/kepennar/Portal/issues/1)
Implement issue#1 (https://github.com/kepennar/Portal/issues/1)
Merge branch 'feature/Issues#1' of https://github.com/kepennar/Portal into feature/Issues#1

Conflicts:
	js/controllers.js
	partials/modals/addCustomFavorite.html
Implementation Issue#1
Merge branch 'feature/Issues#1' into develop
Correct glyphicons font directory
Add a footer with links
Keep twitter widget script on htmlmin phase
add npm-debug to gitignore
Optimization - Disabling requests when jenkins bos is collapsed
Add travis deployment conf
Add travis deployment conf
Add profil property
Encryption keys
travis badeg
Merge branch 'develop'

Conflicts:
	.gitignore
	.travis.yml