Merge pull request #1 from snipertomcat/master

Weekend pull request
Merge pull request #2 from TheDesignAffiliatesInc/master

Pull request - fixed doctine. Added account controller + view
Also merging the weekend updates.