Merge remote-tracking branch 'origin/master'

Conflicts:
	src/com/remotefairy/Search.java
play services refactoring