Merge pull request #9 from samuelralak/develop

Develop
Merge branch 'develop'
Merge branch 'develop'
added tests for updating user #14
added edit action in users controller #14
added edit action in users controller #14
finished setting up the user edit view #14
added tests for the settings link #14
added the update action to handle unsuccessful edits #14
finished update action #14
added sprockets and faker gem #14
added bootstrap paginate gem #14
all tests for user edit passing #14
test code for user authorization #14
added before filters fo signed_in_user #14
test suite for user authorization now passing #14
authorization test code for wrong user #14
added before filters for the correct_user #14
test code for friendly forwading #14
code to implement friendly forwading #14