Update 11122014

https://mobistarwebteam.atlassian.net/browse/REVAMP-349
https://mobistarwebteam.atlassian.net/browse/REVAMP-354