Merge remote-tracking branch 'origin/social-signin' into facebook-merge
Merged facebook oauth2 sign in from social-signin brnach
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of git://github.com/crowdguru/crowdguru
Added trivial unit tests. Will be used to test travis-CI integration.
Initial commit for travis-ci configuration file
Basic configuration done
Test travis-ci. Build should fail because of the unit test!
Fixing compiler error.
Reverting the last commit.
Removed conflicting dependency. Created highly intermittent failure while deploying in travis-ci.

Details are from http://www.slf4j.org/codes.html#log4jDelegationLoop
The purpose of slf4j-log4j12 module is to delegate or redirect calls made to an SLF4J logger to log4j. The purpose of the log4j-over-slf4j module is to redirect calls made to a log4j logger to SLF4J. If both slf4j-log4j12.jar and log4j-over-slf4j.jar are present on the class path, a StackOverflowError will inevitably occur immediately after the first invocation of an SLF4J or a log4j logger.
Revert "Added trivial unit tests. Will be used to test travis-CI integration."

This reverts commit 295a071fa3d5d6f8c89d578f4b219237a83a2759.
Merge pull request #6 from kabexnuf/integrate-travisci

Integration of Travis-CI
Merge branch 'slf4j-log4j-conflict' of https://github.com/kabexnuf/crowdguru into kabexnuf-slf4j-log4j-conflict
resolved merge conflicts in .travis.yml
Added git commit message template

Details
-------
Would be nice if all our commits had the same format.

First line should be one line summary. 'Details' should contain in
depth details.

Also if each line could be no more than 70 chars messages it looks a
lot nicer when viewed through 'git log' in a terminal (no need to
scroll to the right to read the message)

Ticket
------
Introduced the logger into the view test classes

Details
-------
Mostly to see if people like it.  Also reformatted the view test
classes with the formatting style rules from the 'ancillary' folder
(again just to see if people like them/think they are a good idea)

Ticket
------