added camera activity to action bar
fixed icons and merged with master