Changed the following:

- Removed documentation entry regarding use of macros since as of 2.0
  we load the template through ajax
- Add document to globals to avoid jslint error
Fixed merged conflict