Remove pry-stack-explorer
Merge pull request #139 from arsduo/remove-pry-explorer

Remove pry-stack-explorer
Add link to the wiki to the sidebar
Portugese translation for 'trustee resources'
Update Gemfile.lock changed by fe829028ce4da3f963bed2095ca7486b9be7ae02
Attempt at french and russian translations of 84cebcbe2055413e7dd1833e6a71e3fe0802ed25
Fix the russian translation of 'trustee resources'
Explicitly call FactoryGirl methods rather than assume they're not overridden
More FactoryGirl signature
Yet more FactoryGirl
Yet more FactoryGirl
Merge pull request #146 from arsduo/factorygirl-syntax

Better FactoryGirl syntax
Merge branch 'master' into fix-capybara-specs

Conflicts:
	spec/features/step_definitions/project_steps.rb
	spec/features/step_definitions/session_steps.rb