Welcome screen main activity
Merge branch 'pupil' into develop

Conflicts:
	Glaucoma/src/edu/chalmers/glaucoma/MainActivity.java