Merge pull request #50 from conorfennell/master

Adding more tests
Add xit tests for now
Edit and detail prelim templates
Add admin.companies.new functionality
Fix merge conflict
Merge pull request #51 from willwclo/prelim-opp

Preliminary detailed view for opportunities with test scenarios
Merge pull request #52 from FCStrike/master

Add admin.companies.new functionality
Change candidate detail view to be non-editable by default
Merge pull request #53 from FCStrike/master

Change candidate detail view to be non-editable by default
Change two spaces to four spaces in HTML files
Merge pull request #54 from FCStrike/master

Change two spaces to four spaces in HTML files
Prelim opportunity detailed view
Merge pull request #55 from willwclo/prelim-opp

Prelim opportunity detailed view
Update opportunities.tpl.html to reference opportunity
Update company views to be more in line with mockup
BugFix: Change AdminOpportunitiesCtrl to AdminOpportunitiesDetailCtrl
Remove additions to opportunities.tpl.html
Merge pull request #56 from FCStrike/master

Update templates + various bugfixes
Update mocks, crosslink resources
Merge pull request #57 from FCStrike/master

Update mocks, crosslink resources