css height fix
mergin in dans patch

Merge branch 'diffquery' of github.com:sociam/indx into diffquery3
css height fix
css height fix
dan fixed diff

Merge branch 'diffquery' of github.com:sociam/indx into diffquery3
Merge remote-tracking branch 'origin/diffquery3' into diffquery
Added some ng-animate
Merge remote-tracking branch 'origin/diffquery3' into diffquery

Conflicts:
	apps/timon/html/css/timon.less
added delete
Merge remote-tracking branch 'origin/diffquery3' into diffquery
Fix push/append typo