Added factory girl helper method for rspec tests and refactoredtests to use helper
Got rid of redundancy in applied controller and fixed merge conflict for rebasing
Merge pull request #90 from tiger-swallowtails-2014/alisa_applied_controller_tests

Alisa applied controller tests