changes for better linking
Merge commit '7ec0da3475d02f3bb127af1c899fbfdbb28abecc'

Conflicts:
	src/aa.formExtensions.js
fixed merge