Fix bug with N/E counter, notes&container re-ordering (unstable in IE8)
Merge remote-tracking branch 'remotes/origin/dev-SOA-2' into dev-SOA-2