Merge branch 'master', remote-tracking branch 'origin' into Develop
Merged master in develop, moved rdoc into /doc so that the command 'rdoc' works.
Added the new files to be tracked by git.
Re-worked the alert system by using session and helper methods instead of flash.
Refactored a bunch of code so that its simplier and easier to understand. Going to debug later.
Resumed bug fixing, correct_password? is always returning false for some reason.
Fixed merge conflict.