increase re-attempt times; introduce more randomness in sleeping time
Merge branch 'MAID-310_improve_concurrent_handling' of github.com:maqi/MaidSafe-Common into MAID-310_improve_concurrent_handling

Conflicts:
	src/maidsafe/common/sqlite3_wrapper.cc
Changed CMake variable from MaidsafeTesting to INCLUDE_TESTS.
Merge pull request #45 from maqi/MAID-310_improve_concurrent_handling

MAID_310 improve concurrent_handling
Merge branch 'next' of git://github.com/maidsafe/MaidSafe-Common into MAID-390-cereal_integration_common
including cereal to bootstrap_file_tool target
Merge remote-tracking branch 'origin/MAID-423-common_cereal_tests' into MAID-487_cereal_integration
removing proto files
Merge remote-tracking branch 'origin/MAID-487_cereal_integration' into android_setup
Merge pull request #67 from Fraser999/MAID-460

Changed CMake variable from MaidsafeTesting to INCLUDE_TESTS.
Minor update to CMakeLists.txt.
Merge pull request #72 from Fraser999/MAID-500

Minor update to CMakeLists.txt.
Merge pull request #71 from ustulation/MAID-487_cereal_integration

MAID-487 cereal integration
Merge branch 'next' of git://github.com/maidsafe/MaidSafe-Common into android_setup