Add travis basic configuration
Alter travis conf
Update travis conf
Update travis conf
Add basic relation between resource and stream
Merge branch 'develop' into sp3.sc3.stream_resource_relation
Add database.yml
Update travis conf
Merge pull request #18 from projectcs13/sp3.sc3.travis_script

Sp3.sc3.travis script
Add styling to the 'sign up', 'sign in' and 'update your profile' forms
Merge branch 'rameau' into develop
Merge branch 'develop' into sp3.sc3.stream_resource_relation
Merge pull request #17 from projectcs13/sp3.sc3.stream_resource_relation

Sp3.sc3.stream resource relation
Merge with develop branch