snm
Merge branch 'master' of https://github.com/thumbtack-technology/training-2013-page-indexer

Conflicts:
	src/main/java/net/thumbtack/training/page/DaoPage.java
	src/main/java/net/thumbtack/training/pageIndexer/indexer/Indexer.java
	src/main/java/net/thumbtack/training/pageIndexer/indexer/IndexingTask.java
	src/main/java/net/thumbtack/training/pageIndexer/indexer/TaskCreator.java
	src/main/java/net/thumbtack/training/pagemapper/PageMapper.java
	src/main/java/net/thumbtack/training/sqlclient/Dao.java
	src/test/java/net/thumbtack/training/test/database/DataBaseTesting.java
	src/test/java/net/thumbtack/training/test/indexing/IndexerTests.java
log
rest+
Merge branch 'master' of https://github.com/thumbtack-technology/training-2013-page-indexer

Conflicts:
	src/test/java/net/thumbtack/training/test/database/DataBaseTesting.java
	src/test/java/net/thumbtack/training/test/indexing/IndexerTests.java