Merge from upstream
Merge branch 'master' of https://github.com/SungwonKim/StickyOnPage

Conflicts:
	StickyOnPage/.settings/org.eclipse.core.resources.prefs
	StickyOnPage/bin/R.txt
	StickyOnPage/bin/StickyOnPage.apk
	StickyOnPage/bin/classes.dex
	StickyOnPage/bin/classes/com/inha/stickyonpage/BrowsingWebView$1.class
	StickyOnPage/bin/classes/com/inha/stickyonpage/BrowsingWebView.class
	StickyOnPage/bin/classes/com/inha/stickyonpage/LoginActivity$2.class
	StickyOnPage/bin/classes/com/inha/stickyonpage/LoginActivity$3.class
	StickyOnPage/bin/classes/com/inha/stickyonpage/LoginActivity$SaveOauthAsync.class
	StickyOnPage/bin/classes/com/inha/stickyonpage/LoginActivity.class
	StickyOnPage/bin/classes/com/inha/stickyonpage/MainActivity.class
	StickyOnPage/bin/classes/com/inha/stickyonpage/R$id.class
	StickyOnPage/bin/classes/com/inha/stickyonpage/R$layout.class
	StickyOnPage/bin/classes/com/inha/stickyonpage/R$menu.class
	StickyOnPage/bin/classes/com/inha/stickyonpage/R$string.class
	StickyOnPage/bin/classes/com/inha/stickyonpage/R$style.class
	StickyOnPage/bin/classes/com/inha/stickyonpage/R$styleable.class
	StickyOnPage/bin/dexedLibs/facebooksdk-4a65c2610d85ccfb33fb5048206ee1f5.jar
	StickyOnPage/bin/resources.ap_
	StickyOnPage/gen/com/inha/stickyonpage/R.java
	StickyOnPage/src/com/inha/stickyonpage/MemoCRUDActivity.java
Remove log.txt
Display the number of stickies for URL loaded
Merge pull request #14 from talkToHoney/master

pull request