BACKLOG-965 Teams displayed twice

I've removed the second reference to teams and also made the hosts line split per 3 entries
Added .DS_Store (for MAC) to the ignore file
Add versions_v46.sh
Deleted unneeded if-clause in ldap script. Removed duplicate part in tomcat script.
Updated to the only currently available version of Maven, 3.0.5 (hinted by Michael O'Brien on the users mailinglist)
Merge branch 'master' into BACKLOG-1007

Conflicts:
	scripts/install_openconext.sh