Ignore develop branch artifacts
Display warning on drop circular reference

...in Display Condition or Calculate Condition.
Refactor/more descriptive warning message
Check mug absolute path as well as "."
Merge pull request #195 from dimagi/85054-warn-on-circ-ref

Display warning on drop circular reference in Display Condition or Calculate Condition
Roll back absolute path check

- It was broken (should have used that.form...)
- There's no way to drag/drop an absolute path anyway.
Merge pull request #196 from dimagi/85054-warn-on-circ-ref

Roll back absolute path check
Merge branch 'master' into develop

Conflicts:
	.gitignore
Fix .gitignore
fix placement of Show Simple (or Advanced) Mode buttons
Merge pull request #198 from dimagi/fix-buttons

fix placement of Show Simple (or Advanced) Mode buttons
track clicks on Edit buttons in Logic
track clicks on Show Advanced Mode in Edit Expression
correctly handle undefined _gaq
separate event tracking implementation from view