root:wiki link
Merge branch 'master' of git://github.com/aims-group/aims-site

Conflicts:
	header.php
root:cleanup
Merge branch 'master' of git://github.com/aims-group/aims-site
Merge branch 'master' of git://github.com/aims-group/aims-site
Changed <script> tag to minified js