layout improvements and bug fixes in rendering flash components
search and folder context navigation
Merge branch 'master' of https://github.com/JBEI/ice

Conflicts:
	src/main/webapp/scripts/directives.js
	src/main/webapp/views/entry/experiments.html
use new password encryption
add reset to input in search