face recognition module related changes
face module related changes
face recognition module related changes
resolved merge conflict, face recognition module related changes
Merge remote-tracking branch 'origin' into HEAD

Conflicts:
	server/server-config.js
add opencv to package.json, fix local server-config errors
changes
put back changes
fixing auth.js merge issues
fixing merge errors
client side face recognition modifications
removing unwanted files
changing index page for face recognition
remove unwanted files
remove unwanted files
fixing grunt task errors
beautification of face module
travis changes for opencv
Merge pull request #108 from suprbh/master

Add face recognition module related changes