Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	src/com/protein/main/Startup.java
	src/com/protein/maths/Data.java
	src/com/protein/maths/TransmissionLoss.java
	src/com/protein/ui/MainWindow.form
	src/com/protein/ui/MainWindow.java
Merge remote-tracking branch 'origin/master'