Merge pull request #39 from habuma/master

Merge advanced search feature, including language support from SOCIALTW-41
Merge remote-tracking branch 'upstream/master'