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'
Integrated Ben's header and footer and homepage prototype; added a new
StaticPageController and default template for static pages
Added servlet-api to the web-app dependencies

Details
-------
So that it builds outside of eclipse

Ticket
------
N/A
Removed 2 redundant entries

Details
-------

Ticket
------
Merge remote-tracking branch 'origin/master'
Added jetty plugin to webapp pom

Details
-------
Further reduces the dependency on eclipse, app can be run from the
command line.  Note that jetty needs to be run thus (until I figure
out a better way of dealing with differing app contexts in different
environments): -

mvn -Dcontext.path="/" jetty:run

Ticket
------
Added jetty plugin to the admin app

Details
-------

Ticket
------
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.
Integrated PhantomJS, Selenium and GhostDriver for end-to-end testing, integration testing and html/js unit testing
Merge pull request #6 from kabexnuf/integrate-travisci

Integration of Travis-CI