merging user resolver db with grill server db
moved common method to util
Merge branch 'develop' of github.com:InMobi/grill into protobuf

Conflicts:
	lens-server-api/src/main/java/org/apache/lens/server/api/GrillConfConstants.java
	lens-server/src/main/java/org/apache/lens/server/query/GrillServerDAO.java
	lens-server/src/main/java/org/apache/lens/server/user/DatabaseUserConfigLoader.java
	lens-server/src/main/resources/lensserver-default.xml
some more renames after the merge
some more config related changes. All server Test cases are passing
apt file re generated
Merge pull request #140 from prongs/protobuf

merging user resolver db with grill server db