Brand New !
Merge branch 'master' of github.com:zedd971/tb_cel

Conflicts:
	config.xml
	css/bootstrap.mobile.css
	css/normalize.css
	icon.png
	img/glyphicons-halflings-white.png
	img/glyphicons-halflings.png
	index.html
	js/bootstrap.js
	js/bootstrap.min.js
	js/capture.js
	js/defaut.js
	js/less-1.3.3.min.js
	less/ailante-bs.less
	less/bootstrap.less
	less/functions.less
	res/icon/android/icon-36-ldpi.png
	res/icon/android/icon-48-mdpi.png
	res/icon/android/icon-72-hdpi.png
	res/icon/android/icon-96-xhdpi.png
	res/icon/bada-wac/icon-48-type5.png
	res/icon/bada-wac/icon-50-type3.png
	res/icon/bada-wac/icon-80-type4.png
	res/icon/bada/icon-128.png
	res/icon/blackberry/icon-80.png
	res/icon/ios/icon-57-2x.png
	res/icon/ios/icon-57.png
	res/icon/ios/icon-72-2x.png
	res/icon/ios/icon-72.png
	res/icon/webos/icon-64.png
	res/icon/windows-phone/icon-173-tile.png
	res/icon/windows-phone/icon-48.png
	res/icon/windows-phone/icon-62-tile.png
	res/screen/android/screen-hdpi-landscape.png
	res/screen/android/screen-hdpi-portrait.png
	res/screen/android/screen-ldpi-landscape.png
	res/screen/android/screen-ldpi-portrait.png
	res/screen/android/screen-mdpi-landscape.png
	res/screen/android/screen-mdpi-portrait.png
	res/screen/android/screen-xhdpi-landscape.png
	res/screen/android/screen-xhdpi-portrait.png
	res/screen/bada-wac/screen-type3.png
	res/screen/bada-wac/screen-type4.png
	res/screen/bada-wac/screen-type5.png
	res/screen/bada/screen-portrait.png
	res/screen/blackberry/screen-225.png
	res/screen/ios/screen-ipad-landscape-2x.png
	res/screen/ios/screen-ipad-landscape.png
	res/screen/ios/screen-ipad-portrait-2x.png
	res/screen/ios/screen-ipad-portrait.png
	res/screen/ios/screen-iphone-landscape-2x.png
	res/screen/ios/screen-iphone-landscape.png
	res/screen/ios/screen-iphone-portrait-2x.png
	res/screen/ios/screen-iphone-portrait.png
	res/screen/webos/screen-64.png
	res/screen/windows-phone/screen-portrait.jpg