stash
Merge branch 'master' of https://github.com/anetfreak/tackit

Conflicts:
	.classpath
fb login using js
Merge branch 'master' of https://github.com/anetfreak/tackit