merge from dev
merge

Conflicts:
	android/titanium/src/java/org/appcelerator/titanium/TiBaseActivity.java
merge from dev
updated pull to refresh  example