Merge origin/master

Conflicts:
	src/com/twittermonitor/TwitterMonitor.java