Work in progress popup window control and some test links for it.
Merge branch 'refs/heads/develop' into fb_popup
Fix popup rendering before switching to post-render layout for correct content-based resize.
Finally, dynamic resizing of popup content. Popup location is not updated in realtime due to Ext.js issues with changing layout of previously rendered containers.
Made popups closeable.
Remove test popup content
Start of learn about assays work, creating new modules
Merge branch 'refs/heads/develop' into fb_learnassays
Update build files
Merge branch 'refs/heads/develop' into learnassays
Merge branch 'refs/heads/develop' into learnassays

Conflicts:
	webapp/production/Connector/app.js
Merge branch 'refs/heads/fb_popup' into fb_learnassays

Conflicts:
	app/Connector/bootstrap.js
	app/Connector/packages/connector-theme/sass/var/Component.scss
	app/Connector/sass/example/bootstrap.js
	webapp/production/Connector/app.js
	webapp/production/Connector/resources/Connector-all_01.css
	webapp/production/Connector/resources/Connector-all_02.css
Merge branch 'refs/heads/develop' into fb_learnassays

Conflicts:
	app/Connector/packages/connector-theme/sass/var/Component.scss
	webapp/production/Connector/app.js
	webapp/production/Connector/resources/Connector-all_01.css
Merge branch 'refs/heads/develop' into fb_learnassays

Conflicts:
	webapp/production/Connector/app.js
	webapp/production/Connector/resources/Connector-all_01.css
	webapp/production/Connector/resources/Connector-all_02.css
Merge branch 'refs/heads/develop' into fb_learnassays
Added about page view to home page
Merge branch 'refs/heads/develop' into fb_learnassays

Conflicts:
	webapp/production/Connector/app.js
	webapp/production/Connector/resources/Connector-all_01.css
Terms of use and bug fix

Added terms of use page (work in progress, scrolling currently not working)
Fixed back buttons in learn and about headers to use browser back navigation
Merge branch 'refs/heads/develop' into fb_learnassays
Merge remote-tracking branch 'origin/develop' into develop