Merge pull request #2 from glasslion/master

Merge common confs
Add cntln proxy
Merge branch 'mintel'