fixed broken artemis manual link
Merge remote-tracking branch 'origin/master' into dev
year footer set to 2014
Merge remote-tracking branch 'origin/master' into dev