polarity analysis on single thought with alchemyAPI working!
resolved conflicts
Merge commit '0cb9fe6d924eb2c0e2c9d6705395b650fafac18b' into develop

Conflicts:
	app/src/main/java/edu/ua/cs/thoughts/entities/Thought.java
	app/src/main/res/values/strings.xml