fixed cmd parser when arg is like -+
Fix ocl::calcHarris not support CV_32FC1 bug.
A minor fix.
Fix merge conflicts
Fix the whitespace warning.
Slight modification to example code for FLANN matcher with comment on #3344
Replaced code in .rst file with literalinclude as suggested
Applied fix mentioned in bugreport 3370. Seems to solve the issue.
Added fixes mentioned in bugreport 3306
- Added author provided fixes
- Added code example
- Added documentation fixes
fixed comparison to stop integer wrap around
modified HoughCircleDemo to introduce variable params via trackbars

Conflicts:
	samples/cpp/tutorial_code/ImgTrans/HoughCircle_Demo.cpp
improved error handling
fix typos
fix indent
Remove all using directives for STL namespace and members

Made all STL usages explicit to be able automatically find all usages of
particular class or function.

(cherry picked from commit 2a6fb2867e2fc639e0675eed8abb1688de4539ec)
(only cherry picked "apps/trancascade")
Fixed compilation errors: removed using namespace from hpp file. This led to pulling cv::ACCESS_MASK to global namespace where conflict with the same name in 'windows.h'

Conflicts:
	apps/traincascade/boost.cpp
build fix
fix exception being thrown when no arguments are passed
fixed perf tests for bgfg segmentation
disabled MOG2 performance test (sanity check fails on CUDA 6.0)