tree issues
Merge branch 'dev' of git://github.com/DRDIO/Chatlr into dev
Merge branch 'dev' of git://github.com/DRDIO/Chatlr into dev
Merge branch 'dev' of git://github.com/DRDIO/Chatlr into dev
Merge branch 'dev' of git://github.com/DRDIO/Chatlr into dev
Merge branch 'dev' of git://github.com/DRDIO/Chatlr into dev
Merge branch 'dev' of git://github.com/DRDIO/Chatlr into dev
Merge branch 'dev' of git://github.com/DRDIO/Chatlr into dev
Merge branch 'dev' of git://github.com/DRDIO/Chatlr into dev
Merge branch 'dev' of git://github.com/DRDIO/Chatlr into dev
Merge branch 'dev' of git://github.com/DRDIO/Chatlr into dev
Merge branch 'dev' of git://github.com/DRDIO/Chatlr into dev
fix styles for phone
Merge branch 'dev' of github.com:DRDIO/Chatlr into dev
touch scrolling
Merge branch 'dev' of https://github.com/DRDIO/Chatlr

Conflicts:
	conf/app.conf.js