Merge branch 'master' of github.com:MG-RAST/MG-RAST
Merge pull request #4 from teharrison/develop

missed merges
Merge pull request #435 from teharrison/master

api and web page bug fixes
exchanged newsfeed for a working one
added link to the technical manual
pixel pushing
upload page, now accept small assembeled datasets
fixed login vulnerability
fix bug with .fq files being renamed .fna
fix display of M5RNA in workbench
inputting metagenome id in home page search box redirects to that metagenomes overview page
Merge branch 'master' of github.com:MG-RAST/MG-RAST

Conflicts:
	src/MGRAST/lib/WebPage/Home.pm
Merge branch 'develop' of github.com:MG-RAST/MG-RAST
Merge pull request #475 from paczian/master

added mg-rast login to auth