Added Google Universal Analytics JavaScript
More clearly separated old Analytics from Universal Analytics
Updated and moved asynchronous Analytics in base template