modified:   qtl/templates/wbase.html
	modified:   qtl/urls.py
	modified:   qtl/views.py
	qtl/templates/wouter/display_graph .html
	qtl/templates/wouter/display_individual_trait.html
	qtl/templates/wouter/display_multiple_traits.html
	qtl/templates/wouter/display_output_data.html
	qtl/templates/wouter/search_graph_trait.html
	qtl/templates/wouter/search_individual_trait.html
	qtl/templates/wouter/search_multiple_trait.html
Merge branch 'master' of https://github.com/schoothubber/qtl_project

Conflicts:
	qtl/urls.pyc
	qtl/views.pyc

	new file:   qtl/templates/wouter/display_graph .html
	new file:   qtl/templates/wouter/display_individual_trait.html
	new file:   qtl/templates/wouter/display_multiple_traits.html
	new file:   qtl/templates/wouter/display_output_data.html
	new file:   qtl/templates/wouter/search_graph_trait.html
	new file:   qtl/templates/wouter/search_individual_trait.html
	new file:   qtl/templates/wouter/search_multiple_trait.html
	deleted:    qtl/templates/wouter/search_trait.html