search initial structure
Merge branch 'master' of https://github.com/chinab91/micecolab

Conflicts:
	app/views/general.py
Merge branch 'master' of https://github.com/chinab91/micecolab
models updated
Merge branch 'master' of https://github.com/chinab91/micecolab