Merge branch 'master' of https://github.com/raeefrefai/adrr

Conflicts:
	bower.json
	build.config.js
	src/app/app.config.js
	yii/protected/config/main.php
	yii/protected/controllers/MetaDataController.php
	yii/protected/runtime/application.log

Signed-off-by: Raeef Refai <raeef.refai@gmail.com>
yes
Merge branch 'master' of https://github.com/raeefrefai/adrr

Conflicts:
	bower.json
	build.config.js
	src/app/app.config.js
	yii/protected/config/main.php
	yii/protected/controllers/MetaDataController.php
	yii/protected/runtime/application.log

Signed-off-by: Raeef Refai <raeef.refai@gmail.com>