update dna
Merge branch 'master' of https://github.com/omegaga/SYSU-iGEM-2014

Conflicts:
	server/views/simulation.py
update dna
Merge branch 'master' of https://github.com/omegaga/SYSU-iGEM-2014
Merge branch 'master' of https://github.com/omegaga/SYSU-iGEM-2014
Merge branch 'master' of https://github.com/omegaga/SYSU-iGEM-2014
Merge branch 'master' of https://github.com/omegaga/SYSU-iGEM-2014
update dna
Merge branch 'master' of https://github.com/omegaga/SYSU-iGEM-2014
Merge branch 'master' of https://github.com/omegaga/SYSU-iGEM-2014
update simulation