Completed merge of client + server- now able to push a user app