Merge branch 'dev' into release
Updated make files.
Merge branch 'dev' into release

Conflicts:
	student_signup.info
Updated version.
Removed old version number
Merge branch 'release' into dev
Switched back to dev for make files.