Updated resources/checkConfig.php.
Add warning about unmerged changes in "shellscripts" branch.

refs #209
Merge auth into devel.
Update names (variables and functions) refering to the old Tcl script so that they refer to the current Huygens template.
Merge branch 'devel' into feature/gc3qm

This merge is required to incorporate the changes from commit:2e57f00 that
contained the generic (non-gc3 related) parts of the "Hackathon2013" branch
into the "feature/gc3qm" branch so we can finish the cherry-picking by next
merging the leftover gc3 related changes from the old "Hackathon2013" branch
and finally close that one.

refs #257

Conflicts:
	inc/Job.inc.php
	inc/JobDescription.inc.php