Merge branch 'master' of https://github.com/godu/tatami

Conflicts:
	src/main/webapp/WEB-INF/pages/account_preferences.jsp
	src/main/webapp/css/tatami.css
search engine

Add design css, and sort by type
Autocomplete

Add autocompletion input search
search engine

refactoring search engine
Merge github.com:hellsingblack/tatami
Merge pull request #257 from godu/master

Badass pull request
Updated file upload UI
Search Engine

Finalise request and displaying data
Search Engine

add auto submit input form
Search Engine

Add feature user list + image
Search Engine

Refactoring javascript
Refactoring home page css and js
Refactoring serach engine
Refactoring css profile
add recommended groups
add access to public group
refactoring css
Merge github.com:hellsingblack/tatami

Conflicts:
	src/main/webapp/WEB-INF/pages/account_preferences.jsp
	src/main/webapp/css/tatami.css
	src/main/webapp/js/tatami-admin.js
	src/main/webapp/js/tatami-commons.js
Merge master to master origin
refactoring js code and css