project.pro
Merge remote-tracking branch 'origin/master'

Conflicts:
	ActionBar-PullToRefresh/project.properties