deleted:    bin/cassandra_driver_test
	deleted:    obj/cassandra_db.o
	deleted:    obj/cassandra_driver_test.o
Merge branch 'master' of github.com:srcvirus/pweb_home_agent

Conflicts:
	obj/cassandra_db.o
Merge branch 'master' of github.com:srcvirus/pweb_home_agent

Conflicts:
	obj/cassandra_db.o

	modified:   src/database/cassandra_db.cpp
	modified:   src/test/pweb_home_agent_test.cpp
Merge branch 'master' of github.com:srcvirus/pweb_home_agent

Conflicts:
	obj/cassandra_db.o