Added testing for pages
pages model testing
Merge branch 'master' into testing

Conflicts:
	db/structure.sql
expand tests for pages, include translation to french
expand tests for pages, including admin intergace and index page
add gem files to vcs
add fabricator for SciencePortal
add tests for science portals
add tests for science portals
add tests for science portals
improving specs
adding simple cov
added fabricators to generate user leaderboard
add  new profile env
improve performance on profiles index
Merge branch 'testing' into develop

Conflicts:
	.gitignore
	Gemfile.lock
Merge branch 'master' into develop

Conflicts:
	app/models/user.rb
started work on comment system
added mark down support
update to form