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
metadata template and data validation
Merge pull request #465 from jaredbischof/develop

Edit to make search from home page work
Merge branch 'develop' of github.com:MG-RAST/MG-RAST
added shock node update and tag update
new template validation resource
api: added config varibale to change base api url
Merge pull request #467 from teharrison/develop

api: added config varibale to change base api url
Merge pull request #466 from paczian/master

template validation resource
valid kbase authentication w/o an mgrast user will not return an error but rather continue as unauthenticated
Merge pull request #468 from paczian/master

KBase auth update
fixed login vulnerability
Merge pull request #469 from paczian/master

fixed login vulnerability
fixed error in kbase auth